Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 13 Apr 2024 11:37:13 +0000 (07:37 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 13 Apr 2024 11:37:13 +0000 (07:37 -0400)
f0300fb0597 ; Tweak "(emacs)Bug Reference" formatting/wording.
ea62a14ea3b Fix display of vscrolled windows
4cefa3c0b1f ; * doc/emacs/files.texi (Backup): Clarify "saving" (bug#...
db7b571aaaf ; Improve documentation of 'world-clock'
6a0bb7beae3 * doc/emacs/misc.texi (emacsclient Options): Suggest forw...
859b4227e3d Update go-ts-mode to support latest tree-sitter-go grammar
407e85ce139 Fix c++-ts-mode defun navigation (bug#65885)
aca5064f128 ; Fix last change.
55aab2d4710 ; * etc/PROBLEMS: An entry about focus issues with XFCE (...
19cee16576e ; * doc/emacs/misc.texi (emacsclient Options): Fix typo. ...
2a41b6ba514 ; * src/filelock.c (Flock_file): Doc fix (bug#70216).

1  2 
doc/emacs/files.texi
doc/emacs/maintaining.texi
doc/emacs/misc.texi
etc/PROBLEMS
lisp/progmodes/c-ts-mode.el
lisp/progmodes/go-ts-mode.el
lisp/time.el
src/filelock.c
src/xdisp.c

Simple merge
Simple merge
Simple merge
diff --cc etc/PROBLEMS
Simple merge
index 3a89f0f494bd3b4a8588cb973b404c0c53eb6989,a7a416b94f4bee6e5a6118b0a516b9ff524f53fd..a1b2b1f500c0f09831142757b5b3bf301570e62c
@@@ -1207,10 -1155,10 +1207,12 @@@ BEG and END are described in `treesit-r
                                     "struct_specifier"
                                     "enum_specifier"
                                     "union_specifier"
-                                    "class_specifier"
+                                    ;; Make sure this doesn't match
+                                    ;; storage_class_specifier.
+                                    "^class_specifier$"
 -                                   "namespace_definition")
 +                                   "namespace_definition"
 +                                   "preproc_def"
 +                                   "preproc_function_def")
                                   (and c-ts-mode-emacs-sources-support
                                        '(;; DEFUN.
                                          "expression_statement"
Simple merge
diff --cc lisp/time.el
Simple merge
diff --cc src/filelock.c
Simple merge
diff --cc src/xdisp.c
Simple merge